xen/ia64 with dom0 vp model doesn't need the blkbkack ia64 workarounds

any more.  xen/ia64 dom0 vp model is a big change so that xen/ia64
with the old model (P=M) still remains as the compile option.
Hopefully the work around will be eliminated in the future completely.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 3bae1313ed141a91c781fad4a342e5bffafc63ae..8ed82df72369e9560f22a5ce4883e770e35bd1fc 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
                }
 
                pending_handle(pending_req, i) = map[i].handle;
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
                pending_vaddrs[vaddr_pagenr(pending_req, i)] =
                        (unsigned long)gnttab_map_vaddr(map[i]);
 #else
@@ -546,7 +546,7 @@ static int __init blkif_init(void)
 
        blkif_interface_init();
        
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
        extern unsigned long alloc_empty_foreign_map_page_range(
                unsigned long pages);
        mmap_vstart = (unsigned long)

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
index d82b9ebc3a411345ac79c19af018c038ccaf90b7..ac2b96149048564d4bf3b4f62638e913d3875d14 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
@@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *blkif, unsigned long shared_page)
        blkif->shmem_ref = shared_page;
        blkif->shmem_handle = op.handle;
 
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
        /* on some arch's, map_grant_ref behaves like mmap, in that the
         * passed address is a hint and a different address may be returned */
        blkif->blk_ring_area->addr = gnttab_map_vaddr(op);